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


Trivial merge