[dali_2.1.29] Merge branch 'devel/master' 97/277197/1
authorDavid Steele <david.steele@samsung.com>
Fri, 1 Jul 2022 11:07:31 +0000 (12:07 +0100)
committerDavid Steele <david.steele@samsung.com>
Fri, 1 Jul 2022 11:07:31 +0000 (12:07 +0100)
Change-Id: Iaddc16084aed733846afa2d78cc9205e469b9923


Trivial merge