Merge "Ensure some taskbar states are initialized correctly" into sc-v2-dev