Merge "Don't always intercept swipe transitions" into main