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