Merge "Improve multi user settings screen" into rvc-dev am: 509ae917a4 am: e9a1ca5936 am: e606899218 am: 4c219c4faf am: b7b18fef55
Change-Id: I1ebb1a1c7854342076f001101b8c628c7e500ae7
This commit is contained in: