Merge "Only dump ApfFilter if ApfFilter is actually supported" into main