Merge "Fix an incorrectly created race accessing Wifi Supplicant" into klp-dev