Merge "Remove unused counters from ApfCounterTracker to reclaim APF RAM" into main