Merge "Fix: Undo for drag and drop."