Revert "display: Revert some problematic changes for now."

This reverts commit 231f87b24f702d475365ab37becc1d4903218ca9.

Change-Id: I13fbac5299e6ee50d4f6924ca10ac7c136da288a