Merge "Add optional labels to icon tiles." into main