ActiveDisplay && Fix last commits

Change-Id: Icfb37838fc757e6cda379d3d989104d57859e56c