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

2/7/2019 FF

Change-Id: I78cdd49ab0f4da7ec24e9009ee5dd2cf0cb94ada
CRs-Fixed: 2395201