Merge "Cancel fling animation when starting to drag" into nyc-dev