Merge "Make TileQueryHelperTest less flaky" into rvc-dev