Merge "Fix incident_helper crash."