Merge "[CD Taskbar] Refactor TaskbarManager - Make Window Contexts also follow map pattern" into main