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


Trivial merge