Merge "Fixing issue where we may continue to restore the wrong page after resetting."