Merge "Support grouping in the New App List"