Merge "dumpstate: fix double close."