Revert "Halo: Add master switch to disable Halo (2/2)"

This reverts commit a84ba7c9a93f76035bf3cb0e6c4dc1f7792e8488.

Conflicts:

	res/xml/user_interface_settings.xml