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

Change-Id: Id259dab537c3a6dd0e06e57030e55ace81c87739