[2/2] Active display [squashed]

Change-Id: I714554d8cc80abd5d4979a1215bc5c952e97f981