Merge "Fix taskbar drag view scale when returning to original icon" into tm-qpr-dev