Merge "Reduce lock interactions in backup transport management"