Merge "Never show the alternate bouncer if the primary bouncer is showing" into main