Merge "DragController methods return the consumed gesture" into main