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


Trivial merge