am e3406a2d: better drag beha vior

Merge commit 'e3406a2de3d73ceeda5bcf8e7ce4318d05fe70c8'

* commit 'e3406a2de3d73ceeda5bcf8e7ce4318d05fe70c8':
  better drag beha vior