Merge "Trigger notification force grouping check on group child removal" into main