Merge "Ensure group summary (and any notifications added directly by NMS) have the correct token" into main