Merge "Refine incidentd error handling and logging"