Merge "Make it possible to cancel swipes (1/2)" into main