Merge "Label touch_property_type to associate with vendor_gti_prop" into main