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

This reverts commit 91b490cc22bdade794095ca7d0fa39578d7c8d32.

Conflicts:

	res/xml/user_interface_settings.xml