[dali_2.0.25] Merge branch 'devel/master' 01/258001/1
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 7 May 2021 10:35:03 +0000 (11:35 +0100)
committerAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 7 May 2021 10:35:03 +0000 (11:35 +0100)
Change-Id: I48a9939c6335e982ae4853a2064fd4b8b1b30ec8


Trivial merge