Merge "Tablet-specific UI updates to user switcher. DO NOT MERGE" into rvc-dev am: 7def6932cb

Change-Id: Ie5c70d3413db641e292f93cb12c235efa8e83ae4