[dali_1.9.29] Merge branch 'devel/master' 70/243970/1
authoradam.b <adam.b@samsung.com>
Fri, 11 Sep 2020 11:57:12 +0000 (12:57 +0100)
committeradam.b <adam.b@samsung.com>
Fri, 11 Sep 2020 11:57:12 +0000 (12:57 +0100)
Change-Id: I80d089c67fbb756a2d86e45b67d5ed0883f08130


Trivial merge