Revert "SQUASH# 2: hammerhead display updates"

This reverts commit b2a111b27e8dcf324515588307bba89ebc2b2c76.

Change-Id: I3f80559a04dd6433482f10e0eec34c74cdd133d1
Merge "Revert "SQUASH# 2: hammerhead display updates"" into kitkat