Merge "Fail silently when changing BLUETOOTH_ON/WIFI_ON directly"