Merge "Ensure TileQueryHelper#mTiles is thread safe." into pi-dev