Merge "Implement drag and drop for edit mode" into main