Merge "Fix 2 input issues regarding drag-move/drag-resize."