Merge "Tweak bouncer showing on swipe up" into main