Merge "Fixing Taskbar not initialized properly on recreate" into sc-v2-dev