[dali_2.0.18] Merge branch 'devel/master' 08/255608/1
authorDavid Steele <david.steele@samsung.com>
Fri, 19 Mar 2021 10:34:41 +0000 (10:34 +0000)
committerDavid Steele <david.steele@samsung.com>
Fri, 19 Mar 2021 10:34:41 +0000 (10:34 +0000)
Change-Id: I34e5e3f9ad66d5abc4225680ff5e33c6668cf0ac


Trivial merge