Active display [squashed] (1/2)

Change-Id: Ifd2e88c5dfc7b84613f933bf2e02dba967643088