Revert Active Display commits

too many bugs, battery problems.

Change-Id: I750b5f7675d239a9900ed2bd1e5d5457b4fbbb66