Merge change 8199

* changes:
  Prevent a drag from both scrolling the page and changing the selection.