Merge "Increase swipe gesture areas for hub" into main