Merge "Additional logging to debug lost Wifi APs" into klp-dev