Merge "Bluetooth and NFC added back to Connection preferences"