[dali_1.9.31] Merge branch 'devel/master' 87/244887/1
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 25 Sep 2020 10:58:50 +0000 (11:58 +0100)
committerAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 25 Sep 2020 10:58:50 +0000 (11:58 +0100)
Change-Id: Id3ff79a9e7c09c3aa7b4e7bba1a854913556b762


Trivial merge