Merge "[Taskbar CD] Refactor TaskbarManager for Multiple TaskbarActivityContexts" into main