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


Trivial merge