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

Update display.lnx.5.0 to tip of display.lnx.4.0

Change-Id: I6dca8e907d82260b623b0f1c13c01eb6f991d2ea