Merge "Remove unused maybeSetupCounter in ApfFilter" into main