[dali_2.0.25] Merge branch 'devel/master' 00/258000/1
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 7 May 2021 10:34:58 +0000 (11:34 +0100)
committerAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 7 May 2021 10:34:58 +0000 (11:34 +0100)
Change-Id: I7ef6e9867510216aa81fac5ceb3ec3d41ecf6826


Trivial merge