Revert "SQUASH #4: hammerhead display update"

This reverts commit f41d4daa60bde869742363605c803f33780be04c.

Change-Id: I973b640521e318f3e653c64ec830c66ead8924ad
Merge "Revert "SQUASH #4: hammerhead display update"" into kitkat