Merge "Wait for state refreshed in TileQueryHelper"