Merge "Add Save and Restore of BluetoothOn setting"