Merge "Updating taskbar icon alignment state" into sc-v2-dev