[dali_1.9.5] Merge branch 'devel/master' 78/229078/1
authoradam.b <adam.b@samsung.com>
Fri, 27 Mar 2020 13:29:59 +0000 (13:29 +0000)
committeradam.b <adam.b@samsung.com>
Fri, 27 Mar 2020 13:29:59 +0000 (13:29 +0000)
Change-Id: Idab8962dccdaf89a6972b5a8e9f4ad77342566b1


Trivial merge