Merge "[RefactoredBMS] Don't mix "current dataset" tokens for different backup transports"