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


Trivial merge