Merge "Add interfaces to abstract out Shell DragAndDrop behavior" into main