Merge "Fix clipping issue when dragging app pair icons" into main