Merge "Fix compilation of DragAndDropAcrossApps" into pi-dev