Merge "Revert "Fix libtracing_perfetto performance impact"" into main