Merge "Revert "init: Fix a race condition in KillProcessGroup()""