Merge "[KA02] internal cleanup and refactor for SocketKeepalive"