Merge "Fix 3300849: Illegal state exception during dragging." into honeycomb