Merge "Log WM trace on frame instead of transaction" into sc-dev