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

Change-Id: Ife0ef9e69d8b8da7afdeed905476f644343658fe