[dali_1.9.5] Merge branch 'devel/master' 83/229083/1
authoradam.b <adam.b@samsung.com>
Fri, 27 Mar 2020 14:56:18 +0000 (14:56 +0000)
committeradam.b <adam.b@samsung.com>
Fri, 27 Mar 2020 14:56:18 +0000 (14:56 +0000)
Change-Id: Ia92b4df55bb36776f09d95ee55bc78897902489f


Trivial merge