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

This reverts commit a1ba061714083098dbf2586d1faaae0877b49f46.