Merge "Bouncer - Portrait user switcher tweaks" into tm-dev