Merge "Removing the settings-based IncidentReportArgs method." into pi-dev