Merge "Remove dividers when expanding groups." into sc-dev