[dali_2.1.1] Merge branch 'devel/master' 45/267445/1
authorDavid Steele <david.steele@samsung.com>
Fri, 3 Dec 2021 13:58:07 +0000 (13:58 +0000)
committerDavid Steele <david.steele@samsung.com>
Fri, 3 Dec 2021 13:58:07 +0000 (13:58 +0000)
Change-Id: I8ecf77a66e77dbfcdfc28088f366f95c839be337


Trivial merge