Revert "SQUASH #3: hammerhead display update"

This reverts commit 1a96d84ac84bf7f07f4256f0946707103420653d.

Change-Id: I7eeb6765e8a8b15d13c07d4017b7d765903e4e24
Merge "Revert "SQUASH #3: hammerhead display update"" into kitkat