Merge "Fix ConnectivityController running job counting." into sc-dev