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

* commit '4f1a2db34498ba6addb0d0307bbd33ab25ddcee1':
  Fixing issue where we may continue to restore the wrong page after resetting.