Merge "Revert "Make the SyncManager timeout syncs if it takes too long to bind to them.""