Merge "Restart NAT port timeout measurement when keepalive fails and other fixes"