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