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

Change-Id: Idc8c974f3400d906c1762b444b2b546f74787adf