Merge remote-tracking branch 'quic/display.lnx.3.0-dev' into display.lnx.4.0-dev

Change-Id: I9ec9ff1c5904fd985382cf921e2ed50b053168b6