Merge "Bouncer User Switcher - Use flags"