Merge "Fix UI bugs when dragging items"