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

Change-Id: Id940412e8a353d8faab438962526d7404b4298d5