[dali_1.9.21] Merge branch 'devel/master' 19/238819/1
authoradam.b <adam.b@samsung.com>
Fri, 17 Jul 2020 12:12:53 +0000 (13:12 +0100)
committeradam.b <adam.b@samsung.com>
Fri, 17 Jul 2020 12:12:53 +0000 (13:12 +0100)
Change-Id: Icc3a4e0c5b3cb6208b5cd0344b177b9a610a4ccf


Trivial merge