Merge "[ipsec-qtaguid] Tag sockets upon creation of encap sockets"