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: 0f542339 am: c3b50d13
Change-Id: I1eb8520c0972af52962ed32d3f031fe56bb8dc45