Merge "Add more robust handling of daemon crashes"