Merge "Revert "Fix race conditions in removing dying process record""