Merge "ApfFilter.resume() cleans up APF memory to ensure accurate counters" into main