Merge "Bouncer User Switcher UX tweaks"