Merge "wm tracing: refactoring prior perfetto migration" into main