Merge "Fix taskbar icon dragging issues" into sc-v2-dev