[dali_2.0.17] Merge branch 'devel/master' 42/255142/1
authorAdam Bialogonski <adam.b@samsung.com>
Fri, 12 Mar 2021 10:51:53 +0000 (10:51 +0000)
committerAdam Bialogonski <adam.b@samsung.com>
Fri, 12 Mar 2021 10:51:53 +0000 (10:51 +0000)
Change-Id: Id9f6488e9c5ad9ef483750b368ed0955aee43250


Trivial merge