Revert "[1/2] Base: Fix pimp up ActiveDisplay"

This reverts commit 0c540513beb33d0a1b21d813eea4dd2c6209d0c0.

Change-Id: I72c7f368fc4160212edc32dadecfba600a01d08a
Merge "Revert "[1/2] Base: Fix pimp up ActiveDisplay"" into illusion-4.4