Restore device settings

Conflicts:
	res/xml/settings_headers.xml