Merge "Remove unused and untested DraggableHandler code" into main