Merge "Fix a long standing locking issue with tracing thread" into rvc-dev