Merge change 27325 into eclair

* changes:
  Don't forget to clear "backup in progress" state when finishing a pass