Merge pull request #17639 from mrjana/restart

Fix a corner case issue when daemon panics