Merge "Revert "Improve multi user settings screen"" into rvc-dev am: e13919cf4b

Change-Id: I057a3f120e9664fd4764599e14b6d136da56da85