Merge "Handle a race condition between process killing and restarting" into sc-dev