Revert "galaxys2: remove DeviceSettings"