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