Merge "Fix leakage of GestureExclusionListener" into main