HALO: Add master switch to disable Halo (2/2)

Also did some cleanup.

Change-Id: I75ea21375649f56c700227a2658bc05c1f8bb4b8