Merge "Remove encryption from incidentd" into qt-dev