Revert Active Display commits

too many bugs, battery problems.

Change-Id: I719e7fcfa8adcdf14fb626f79d3e2572a841200a