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


Trivial merge