[dali_2.1.5] Merge branch 'devel/master' 72/269472/1
authorDavid Steele <david.steele@samsung.com>
Fri, 14 Jan 2022 15:41:00 +0000 (15:41 +0000)
committerDavid Steele <david.steele@samsung.com>
Fri, 14 Jan 2022 15:41:00 +0000 (15:41 +0000)
Change-Id: I18c31565b9194da11cdaa32bd2a4bb861a58e906


Trivial merge