Merge "Turn off default SF tracing" into main