Merge "Add orientation logic to taskbar icon specs" into main