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

Change-Id: I9a3ae7536fd6db6ed50af619c34acff5941d8786