Merge changes Iae43f695,I6ca164ad,I4f579393,Icbb67c3c

* changes:
  Rename saveAvailableRollback to saveRollbackData.
  Have RollbackData reuse RollbackInfo.
  Miscellaneous cleanup in RollbackStore.
  Rename RollbackData.inProgress to restoreUserDataInProgress.