Merge "Fix cross-app drag and drop crash."