Merge "Changes after DragAndDropDetector was removed" into devel/master