Merge "Recheck if the network state in expedited job is unexpected." into sc-dev