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