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