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

This reverts commit 70c619fce985b8d0f281532ad04a9095fb48fa3d.