Merge "Guard NPE in getIcon of Tile"