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

Fast forward dev-4.0 to the tip of dev-3.0

Change-Id: I17f7b88ae5714cc4cdf7115dc8575d2f0420c6d9