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


Trivial merge