More Active Display stuff

Change-Id: Iaa5d58a0b10240b2e3bc893eb029b3c3423d38d3