Revert "[1/2] Base: Pimp up ActiveDisplay"

This reverts commit c8d0b2f4fe55e22a5b803a27c18be0bf3b2a36da.

Signed-off-by: Kristofer Ard <kristoferard@gmail.com>

Conflicts:
	core/java/android/provider/Settings.java