Merge "init: non-crashing service can restart immediately"