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


Trivial merge