Merge "Revert "Improve multi user settings screen"" into rvc-dev am: e13919cf4b am: 99bb5e0185 am: 8dae9e21f5 am: ead1ce514d am: 47bd0e8c14
Change-Id: I2e5ecfdd0cd6f80c9c35e249bc9bf307e00bf29f
This commit is contained in: