Merge "[qca-nss-clients] Fix for a crash when klips dev is NULL"