Merge "Fix DragAndDropPolicy to use API" into main