[dali_2.0.30] Merge branch 'devel/master' 32/259732/1
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 11 Jun 2021 10:36:18 +0000 (11:36 +0100)
committerAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 11 Jun 2021 10:36:18 +0000 (11:36 +0100)
Change-Id: I61fa9cb91aa99b4b1202f40305a8b527d9922724


Trivial merge