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


Trivial merge