Merge "Check WWAN is in service before exiting hysteresis timeout." into main