Halo: Add master switch to disable Halo (2/2)
Also did some cleanup.

Conflicts:
	res/values/strings.xml