[dali_2.1.4] Merge branch 'devel/master' 97/269097/1
authorAdam Bialogonski <adam.b@samsung.com>
Fri, 7 Jan 2022 10:06:49 +0000 (10:06 +0000)
committerAdam Bialogonski <adam.b@samsung.com>
Fri, 7 Jan 2022 10:06:49 +0000 (10:06 +0000)
Change-Id: I1dfef02fd6e758ee3aab6af6e84c14ba0e26224f


Trivial merge