Improved workaround for wlan0 device name change