Merge "Ensure APF counter increased for testDropPingReply() and testReplyPing()" into main