Merge "Improve multi user settings screen" into rvc-dev am: e26de87100
am: e7e0479c36
am: ce855ed43e
Change-Id: I4eea44c40359e65c8b5cc7612ad3b5427963cd8f
This commit is contained in: