display: merge fix

Change-Id: I94285ec7c69e3857777cd17fe3958ec4600c5591