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