Merge "Revert "Persist delayed calls to factory reset...""