[dali_2.1.5] Merge branch 'devel/master' 70/269470/1
authorDavid Steele <david.steele@samsung.com>
Fri, 14 Jan 2022 15:40:51 +0000 (15:40 +0000)
committerDavid Steele <david.steele@samsung.com>
Fri, 14 Jan 2022 15:40:51 +0000 (15:40 +0000)
Change-Id: Ib9431c899ce189c3573c97c48be9ea8a1f54ae63


Trivial merge