move Heads Up preference back into advanced options

Change-Id: I9221fc49b5f76853d25a30f76a0a7e2a01c8d750