Merge "Revert "Remove NOTIFICATION_GROUP_EXPANSION_CHANGE flag."" into main