Active Display updates from ChaOS

Change-Id: I4d281e61cd61671f710681f622540961a72c40db
nevermind....

Change-Id: Ice54a2ca61cf1e25a75f0d582a3952c813637e06