Merge "Don't always set alternateBouncerUIAvailable to true" into main