Merge remote-tracking branch 'quic/display.lnx.3.0-dev' into LA.HB.1.3.9

Change-Id: Ic494c2f6350da6fb5d03fbfe1f9fcfebd8b270f0