[dali_2.1.2] Merge branch 'devel/master' 56/267856/1
authorRichard Huang <r.huang@samsung.com>
Fri, 10 Dec 2021 11:59:24 +0000 (11:59 +0000)
committerRichard Huang <r.huang@samsung.com>
Fri, 10 Dec 2021 11:59:24 +0000 (11:59 +0000)
Change-Id: I1fd1b89f66c7fa229336bcd570397812e3816247


Trivial merge