Merge "Fix potential exceptions in CallDiagnosticService and missing locks." into sc-dev