Merge "Use readUniqueFileDescriptor in incidentd service" into rvc-dev