[dali_1.4.30] Merge branch 'devel/master' 73/210973/1
authoradam.b <adam.b@samsung.com>
Fri, 26 Jul 2019 10:48:44 +0000 (11:48 +0100)
committeradam.b <adam.b@samsung.com>
Fri, 26 Jul 2019 10:48:44 +0000 (11:48 +0100)
Change-Id: I9c4d44fb4f480e0fbd0c45558d32ab1db98c966f


Trivial merge