Merge "Implement client death monitoring."