Merge branch 'display.lnx.3.0-dev' into display.lnx.4.0-dev

Change-Id: Ic8e3787239104d259a3c5ff51697dec31e91b06a