Merge "Collapse shortcuts with the same label and icon" into main