Merge "Dumpstate: Refactor DumpHals"