Active Display: Some Fixes

Change-Id: I2f506af394dee03fb52de9870f97abd99bc03872