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