ActiveDisplay: still a shitshow

Change-Id: Icec41f0b096e74549e8efd92b95841e810595d52