Merge "Do not turn on Bluetooth when booting into Safe Mode"