Merge "Drag/drop APIs and infrastructure"