Merge "Use Tile.getIcon() to avoid caching issue"