Merge "wm tracing: rename intdefs to improve names consistency" into main