Merge "Fix synchronization in SystemStateHelper" into sc-dev