Merge "Add channel mode preference for Bluetooth developer option"