Merge "Fix that backupFinished() callback is not called sometimes." into nyc-dev