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

Change-Id: Iba4df21e3fad2aeb7135199ce66ae4177f2cab4a