Active Display:  Massive revert

    Seems like the majority of the AD issues began with the pimp up AD
    commit and continued to get worse.  Roll back everything to the
    initial commit to bring AD to kitkat and go from there.

* Revert commit 3693f316bb5289128641d0d41ca0db291d41ca6f

Change-Id: Idd8046a4ff831e077266d8fdb51635ad7cdd3b1e
Signed-off-by: scott <scott@ubuntu.com>