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


Trivial merge