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

Change-Id: I7069370f31ff9bb75c56131ddda46c1dece72d8d