Merge "Prevent tap in swipe up zone from closing KQS" into main