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