Merge "[CD Taskbar] Fix - Make Taskbar Icons Launch" into main