Merge "Simplefying listener interface for TriggerSwipeUpTouchTracker" into main