Merge "Replace drag and drop mouse pointer shape" into nyc-dev