PIM-2002 Fix broken attribute group sort order when sorting the currently edited group