Merge "Fix bug with app pairs appearing in wrong orientation in pinned Taskbar" into main