Merge "Revert "Extract assistant logic from NavigationBar to share with Taskbar"" into sc-v2-dev