Merge "Grab the tracing lock before calling the trace runner" into sc-dev