Heads Up Toggle [2/2]

Change-Id: I92231fa940955afcdc5772c15fb0df7a32f07870