Merge "Fix WifiManager async API"