Merge "Remove dumpstate error race condition"