Merge "Make DragAndDropController optional" into udc-dev