WIP: new display policy

Change-Id: Icdef5419805a0c4f7613f0dae3f91a9600ec7348