[dali_1.9.5] Merge branch 'devel/master' 79/229079/1
authoradam.b <adam.b@samsung.com>
Fri, 27 Mar 2020 13:30:13 +0000 (13:30 +0000)
committeradam.b <adam.b@samsung.com>
Fri, 27 Mar 2020 13:30:13 +0000 (13:30 +0000)
Change-Id: I1692bf928753f9b2a4e45ca047611c741b82ef2f


Trivial merge