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