Merge changes I342cd7d0,I2c55831b into qt-dev

* changes:
  Get incidentd cts working again.
  Don't include restricted images in incident reports unless they're specifically mentioned in the IncidentReportArgs