DeviceSettings: Restore more accidentally removed constants
DeviceSettings: Remove obsolete file