Merge "Add NAT-T keepalive filter to all-features on test program" into main