Merge "Tablet-specific UI updates to user switcher. DO NOT MERGE" into rvc-dev...
Merge "Tablet-specific UI updates to user switcher. DO NOT MERGE" into rvc-dev am: 7def6932 am: 9463b875 am: e3968788
Change-Id: Iff7e3e14eb8eee672eeccdecfe232acff353bb9b