Merge "Fix cross-app drag and drop" into nyc-dev