Merge "Improve multi user settings screen" into rvc-dev am: e26de87100 am: e7e0479c36 am: dcf5391ec4 am: 6733b9d532 am: 116fae2739
Change-Id: Icc07b865a156b63a2968cfefc77874d8c4708d83
This commit is contained in: