Merge "Apply new preference and controller for Bluetooth developer option"