Merge "Add base preference for new Bluetooth developer option"