Merge "Fix taskbar icon dragging issues"