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


Trivial merge