Merge "Improve unfold related logging in perfetto traces" into main