Merge "Fix BlobBackupHelper state tracking"