Merge "Improve multi user settings screen" into rvc-dev am: 509ae917a4
am: e9a1ca5936
am: e606899218
Change-Id: I263c6031961a5f073df3626dbdc239347870f1fc
This commit is contained in: