After the linked LG-2106 is implemented: update the combobox package and use the xsmall variant directly in the aggregation stage builder