Merge "[CD Taskbar] Fix Window Context & Enable External Context adding" into main