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


Trivial merge