Merge "Fix sticking wifi_on to WIFI_DISABLED_AIRPLANE_ON after aiplane mode off"