Merge "Add channel mode preference controller for Bluetooth developer option"