Merge "Add codec dialog preference for Bluetooth developer option"