Merge "Keep the keepalive process going after NAT port is changed."