Merge "Bluetooth settings revamp"