Merge "Support for multiple gestures at once" into main