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


Trivial merge