am f681be94: am c9d55c0d: Merge "Fixing issue where drag view is jumping when you scroll from hovering over an edge.  (Bug 8522679)" into jb-mr2-dev

* commit 'f681be949fbb326a24b7b3ae8d329f5f62d86f5a':
  Fixing issue where drag view is jumping when you scroll from hovering over an edge.  (Bug 8522679)