Merge "Reduce memory churn from main thread looper tracing" into main