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: I6958b6bfb41b86b655c02b0a1a62457d2c8ef453