[dali_2.0.24] Merge branch 'devel/master' 60/257760/1
authorRichard Huang <r.huang@samsung.com>
Fri, 30 Apr 2021 10:02:59 +0000 (11:02 +0100)
committerRichard Huang <r.huang@samsung.com>
Fri, 30 Apr 2021 10:02:59 +0000 (11:02 +0100)
Change-Id: I3231d0fe7b661b1321a592417abdc98deb0feb43


Trivial merge