latest: CollapsibleSet: Fix the icon setting bugs
Merge branch 'collapsibleset'