Merge "Allow enabling Bluetooth without auto-connecting."