Merge "Avoid per task app icons in Taskbar for desktop mode" into main