Merge "Add new audio channel mode dialog layout for new Bluetooth developer option"