Merge "Enable conditional handling of drags." into nyc-dev am: 3385ebdca3
am: 7ff70c8864

* commit '7ff70c8864ba16df00ea8f1ae8d487fe6c4755cf':
  Enable conditional handling of drags.