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


Trivial merge