[dali_2.1.17] Merge branch 'devel/master' 12/273612/1
authorDavid Steele <david.steele@samsung.com>
Fri, 8 Apr 2022 11:55:23 +0000 (12:55 +0100)
committerDavid Steele <david.steele@samsung.com>
Fri, 8 Apr 2022 11:55:23 +0000 (12:55 +0100)
Change-Id: Ia7391a7a99cb78767c4f9738e1cff53b9509db3d


Trivial merge