Revamp Halo Settings

Change-Id: Ic441c039542a7f5ddfe1d158b4c0320c52c3ebb8