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

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