Merge "CarDiagnosticEvent clean up" into qt-dev