Merge "Simplify the drag logic for edit mode." into main