Merge "wm tracing: more logging" into main