Revert "Add active display to ChameleonOS [1/2]"

This reverts commit 15cd08e921151c7d6452facbb533576da09923fd.

Change-Id: Ia721e3fad2096bbfa6951434ce94eef60c289e58
Merge CHAOS AppBar changes

Change-Id: I9652914bcfeb067a110fb771e95f2de44082aff4
cleanup derp

Change-Id: I45906edd14b3017a8fca676937c4279f016c6120