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

Change-Id: I540056d9295635cb4d2ffcaf2512ee6dbe0ddc0a