[dali_2.1.7] Merge branch 'devel/master' 60/270360/1
authorAdam Bialogonski <adam.b@samsung.com>
Fri, 28 Jan 2022 12:11:20 +0000 (12:11 +0000)
committerAdam Bialogonski <adam.b@samsung.com>
Fri, 28 Jan 2022 12:11:20 +0000 (12:11 +0000)
Change-Id: I880784f2ae7c54b497e90e30419afc023987b1b6


Trivial merge