Merge "dumpstate: stop including "LOG STATISTICS"." into main