Base: more fix Active Display (again)

Change-Id: I53eb8a6a7c462b35fdfece0400622c04c463d105