Merge "Tablet-specific UI updates to user switcher. DO NOT MERGE" into rvc-dev am: 7def6932 am: 0f542339 Change-Id: I174b03c1b2e8d1395f3c19e66432180637d807d8