Fix ActiveDisplay

Change-Id: I1751fa24de1d29244003ae34314df5c5866ffe51