Merge "Fix bug with cancelled drag" into nyc-dev