Merge "Persist the debug time correction flag."