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


Trivial merge