Merge "Show the user switcher only when the bouncer cancel button is pressed."