Merge "Use NestedDraggable to handle STL gestures" into main