display: Merge changes from display.lnx.4.0

Change-Id: I9cd5aec75486514b6dfb04b6edc58e6eff1ff01b