Merge "Clean up BOUNCER_USER_SWITCHER flag" into main