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


Trivial merge