[dali_2.1.9] Merge branch 'devel/master' 60/270960/1
authorDavid Steele <david.steele@samsung.com>
Fri, 11 Feb 2022 12:02:08 +0000 (12:02 +0000)
committerDavid Steele <david.steele@samsung.com>
Fri, 11 Feb 2022 12:02:08 +0000 (12:02 +0000)
Change-Id: I262e814320e50378295fe187491702e48554901f


Trivial merge