Merge "Store Tile in view tag, not position"