Merge "Add encryption in incidentd." into qt-dev