Merge "Allow TestHarness exemption from forced grouping notifications" into main