Revert "SQUASH #1: hammerhead display update"

This reverts commit 49a7e52477cc05b5febabf440a6ff1ad4bf84b28.

Change-Id: If46b900f41187ea24127653c6405e91b708e2519
Merge "Revert "SQUASH #1: hammerhead display update"" into kitkat