Merge "[qca-nss-clients] Fix ipsec restart issue."