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


Trivial merge