Halo: Add master switch to disable Halo (2/2)
Change-Id: I78942ea1a31b7158172614b9f7baf2255b15db25