[dali_2.1.5] Merge branch 'devel/master' 71/269471/1
authorDavid Steele <david.steele@samsung.com>
Fri, 14 Jan 2022 15:40:56 +0000 (15:40 +0000)
committerDavid Steele <david.steele@samsung.com>
Fri, 14 Jan 2022 15:40:56 +0000 (15:40 +0000)
Change-Id: I5c92dc47e176524f6f4928059e1d7a8e8292efc2


Trivial merge