Merge "Handle CancellationException in BackupTransportClient" into tm-dev