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


Trivial merge