Merge "[CD Taskbar] Refactor TaskbarManager to store TaskbarRootLayouts in a map" into main