Merge "Revert "Improve multi user settings screen"" into rvc-dev am: e13919cf4b
am: 99bb5e0185
am: 18c5aee365
am: 557419a2e5
Change-Id: I9bda6086258c8b2ac127935e4e8654a4388b16e3
This commit is contained in: