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


Trivial merge