Merge "Separate options parsing from running dumpstate"