Merge "Remove on-disk WM trace logging"