Merge "Fix a bug in single socket connection to Wifi Supplicant" into klp-dev