am 1d8ad0dd: Merge "Fix 3099036: Drag visualization appears in wrong spot" into honeycomb

* commit '1d8ad0dd3b295b35e7fc9944eb298150b4fa4a99':
  Fix 3099036: Drag visualization appears in wrong spot