Merge "Move more drag-related code to DragState" into nyc-dev