Merge "Regroup app-grouped notifications after classification" into main