HALO error fix

Conflicts:
	res/xml/system_ui_settings.xml