Sync to upstream (sidewalks to rendering_types)