Halo: Add master switch to disable Halo [2/2]

Change-Id: If6e39222bfed29624b0e92ee4a879a9aa732129d