[dali_1.4.56] Merge branch 'devel/master' 42/223642/1
authoradam.b <adam.b@samsung.com>
Fri, 31 Jan 2020 11:13:42 +0000 (11:13 +0000)
committeradam.b <adam.b@samsung.com>
Fri, 31 Jan 2020 11:13:42 +0000 (11:13 +0000)
Change-Id: I72db785660a1fe90eff9e231ba0b6fd8b48a6883


Trivial merge