Merge "Disable Bluetooth if BLE was disabled while enabling"