Easily remove camera settings from under settings/buttons

- Some how the old method was not working and so it was showing up on
all devices to include those without camera h/w keys (flo, m8, etc)

Change-Id: I216d33326411871fe4ffaa0f35aa7d97b2337398