Merge "Add base dialog preference controller for new Bluetooth developer option"