Merge "Fix flakiness for ExternalStylusConnectedDuringTouchGesture" into main