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


Trivial merge