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


Trivial merge