Merge "Update visual indicator on tiling to match tiled size." into main