[dali_1.9.25] Merge branch 'devel/master' 98/241098/1
authorgreynaga <g.reynaga@samsung.com>
Fri, 14 Aug 2020 10:40:11 +0000 (11:40 +0100)
committergreynaga <g.reynaga@samsung.com>
Fri, 14 Aug 2020 10:40:11 +0000 (11:40 +0100)
Change-Id: Ice48ae91af6fa0940e44b9104daa2c87dcd6ea06


Trivial merge