Merge "Changed logic when dumpstate's max progress increases." into nyc-dev