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

This reverts commit ba837193989dd0f13a3c792a17ec69bbcdce100d.