backport upstream 16655 - Fix race condition that prevents queries from being buffered after vtgate startup #316