Merge "Generalize the icon popup menu types." into sc-v2-dev