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