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