Merge "apf: Add counters for dropped / passed packets" into pi-dev