Halo: Add master switch to disable Halo (1/2)

Signed-off-by: Paul Beeler <sparksco@gmail.com>

mbc596

Conflicts:
	core/java/android/provider/Settings.java