[dali_2.0.4] Merge branch 'devel/master' 59/249059/1
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 4 Dec 2020 14:58:01 +0000 (14:58 +0000)
committerAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 4 Dec 2020 14:58:01 +0000 (14:58 +0000)
Change-Id: I238aab4eb3a827a54a369783cc2a27654414407c


Trivial merge