Halo: Add master switch to disable Halo (2/2)
Also did some cleanup.
Merge remote-tracking branch 'paranoid/jellybean' into gn