Merge "Move more drag-related code to DragState" into nyc-dev am: 40089ca995
am: 566fdffebb

* commit '566fdffebb12f6cbdb369dfa30e319b8eeb871b5':
  Move more drag-related code to DragState