Merge change 750 into donut

* changes:
  Fixed the Bluetooth On/Off Checkbox in settings so it is enabled/disable properly.