Merge "Revert "Warn only if we're tearing down "live" DeathRecipient content""