Merge changes I28031a27,If98d7397 into qt-dev

* changes:
  Fix a bug in IncidentCompanionService
  Disable incidentd encryption.