Drag cursor should now accurately reflect what will happen on drop
Merge branch 'fix-drag-cursor-icons' into dev-gradle