Merge "Show running apps in Taskbar when in Desktop Mode" into main