display: Merge changes from display.lnx.4.0

Change-Id: I5906a2e18c61cc12740fdae2316b0090d314c1cc