Merge "Add TileAdapterDelegate"