[dali_2.0.23] Merge branch 'devel/master' 97/257397/1
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 23 Apr 2021 08:30:00 +0000 (09:30 +0100)
committerAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 23 Apr 2021 08:30:00 +0000 (09:30 +0100)
Change-Id: I99046fa7bc0b4032036e441102d66cf44aee1f9c


Trivial merge