Merge "Convert onCallFilteringComplete to use single arg" into sc-dev