Merge "Fix deadlock in BackupManagerService"