Merge "Remove FLAG_GROUP_SUMMARY when updating auto-grouped notifications" into main