Merge "Fix 2 graphical issues for drag resizing."