Merge "Allow two back gestures in quick succession" into main