[dali_2.0.40] Merge branch 'devel/master' 48/262848/1
authorDavid Steele <david.steele@samsung.com>
Fri, 20 Aug 2021 11:19:10 +0000 (12:19 +0100)
committerDavid Steele <david.steele@samsung.com>
Fri, 20 Aug 2021 11:19:10 +0000 (12:19 +0100)
Change-Id: I747b42029bd8beae707278fbe4b83edd666c7bb2


Trivial merge