Merge "Persist Bluetooth CoD config value across reboot"