Merge "tracing: Have tracing_off() actually turn tracing off"