Merge "Clean up APIs for transferTouchGesture" into main