[dali_1.4.40] Merge branch 'devel/master' 87/215287/1
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 4 Oct 2019 12:41:42 +0000 (13:41 +0100)
committerAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 4 Oct 2019 12:41:42 +0000 (13:41 +0100)
Change-Id: I0eb02d519b706161edef5044f3a77543b5041c91


Trivial merge