Merge "Fix race+logging issue in SystemStateHelper" into sc-dev