Fix DeviceSettings