Merge "Revert "Improve multi user settings screen"" into rvc-dev am: e13919cf4b
am: 99bb5e0185
am: 8dae9e21f5
am: ead1ce514d
Change-Id: I141e5db7c5a859dd8a2f8df895cc6c8a51d43e2f
This commit is contained in: