[dali_2.0.23] Merge branch 'devel/master' 96/257396/1
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 23 Apr 2021 08:29:55 +0000 (09:29 +0100)
committerAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 23 Apr 2021 08:29:55 +0000 (09:29 +0100)
Change-Id: I0b82fb540bfe9571c2182e67d53af3ad64a0e3fe


Trivial merge