Merge "Redesign user switcher" into rvc-dev am: 46b8dc5f20 am: 5412d05d3c

Change-Id: Ia8604da3b15e1c84d24056dd342c1d7ba0003d68