Merge "Allow new gestures to cancel current gestures"