Merge "Restore correct mouse pointer after drag and drop"