Merge "Update taskbar drag and drop treatment" into sc-v2-dev