Revert "Revert "i9100: remove DeviceSettings""