Merge "Allow new gestures to cancel current gestures" into udc-dev