Merge "dumpstate: more tweaks in the data collection order."