[dali_1.4.22] Merge branch 'devel/master' 69/207269/1
authoradam.b <adam.b@samsung.com>
Fri, 31 May 2019 09:52:31 +0000 (10:52 +0100)
committeradam.b <adam.b@samsung.com>
Fri, 31 May 2019 09:52:31 +0000 (10:52 +0100)
Change-Id: I389903685dd4112294a96756a34f5fb2317ee6d2


Trivial merge