[dali_2.0.12] Merge branch 'devel/master' 09/253209/1
authorRichard Huang <r.huang@samsung.com>
Fri, 5 Feb 2021 11:59:06 +0000 (11:59 +0000)
committerRichard Huang <r.huang@samsung.com>
Fri, 5 Feb 2021 11:59:06 +0000 (11:59 +0000)
Change-Id: I0e4c66fe2078dcc278597f3a4e51bbd447a3c775


Trivial merge