Merge "Improve multi user settings screen" into rvc-dev am: 509ae917a4

Change-Id: I8c3296ea5faaf4bd727741abcd7fd42ee397b30a