Merge "Ensure all gesture state is reset between gestures"