Merge "Fix for drag start event being incorrectly cached" into nyc-dev