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

This reverts commit efefafe01955747d065db20307d8eb10f790ec4f.