[dali_2.0.26] Merge branch 'devel/master' 90/258390/1
authorAdam Bialogonski <adam.b@samsung.com>
Fri, 14 May 2021 10:21:43 +0000 (11:21 +0100)
committerAdam Bialogonski <adam.b@samsung.com>
Fri, 14 May 2021 10:21:44 +0000 (11:21 +0100)
Change-Id: I574e2eaed3644e578cd14a4269b3931725c6897b


Trivial merge