Merge "signal_catcher: Only notify tombstoned when we're using it."