Merge "Fix the incorrect "Add group" icon" into klp-dev