Merge "v23/syncbase: Fix TestBlockedWatchCancel race condition."