Merge "Fix drag and drop regression. Bug: 5032496"