Revert "Squash #5: hammerhead display update"

This reverts commit 2534b2381c3b88cc024d0910a1936baf1d357d90.

Change-Id: Icd89f25b7d1910608aee8dccee0296ab8145ee47
Merge "Revert "Squash #5: hammerhead display update"" into kitkat