Fix TestGatewayBufferingWhileReparenting
flakiness
#13469
Merged
TestGatewayBufferingWhileReparenting
flakiness
#13469