Merge "Move drag and drop related lines to DragDropController"