Merge "Fixing out of order taskbar callbacks" into sc-v2-dev