Merge "Revert "Improve multi user settings screen"" into rvc-dev am: e13919cf4b
am: 99bb5e0185
am: 18c5aee365
Change-Id: I2a784c8981977082292394a48d3fd5b5fc4ee819
This commit is contained in: