[dali_2.0.36] Merge branch 'devel/master' 42/261742/1
authorRichard Huang <r.huang@samsung.com>
Fri, 23 Jul 2021 09:29:17 +0000 (10:29 +0100)
committerRichard Huang <r.huang@samsung.com>
Fri, 23 Jul 2021 09:29:17 +0000 (10:29 +0100)
Change-Id: I612492eb75a3136f2fb3f3800d28700c7a9513dc


Trivial merge