Merge "Add codec dialog preference controller for Bluetooth developer option"