Fix Halo button not showing up on toggle

Change-Id: I3b0acfd2757f227e521222a4fa990bbf991afe1a
Merge "Fix Halo button not showing up on toggle" into kk44