Revert: [1/2] Active Display

Change-Id: If6513720c2dc14732b0f060ff2ccd2bab415a565