Merge "Improve multi user settings screen" into rvc-dev am: 509ae917a4
am: 2718b93da7
am: 1cb3da54e9
Change-Id: I7f6c8e308b079cb38139166387af214a5a10b9b9
This commit is contained in: