Revert "[1/3] Base: Squashed commits for 4.4 active display"

This reverts commit 304e78585b48e2429745c68d704912e10dc652f5.
[1/3] Base: Squashed commits for 4.4 active display