[dali_1.9.17] Merge branch 'devel/master' 12/236712/1
authorgreynaga <g.reynaga@samsung.com>
Fri, 19 Jun 2020 11:04:22 +0000 (12:04 +0100)
committergreynaga <g.reynaga@samsung.com>
Fri, 19 Jun 2020 11:04:22 +0000 (12:04 +0100)
Change-Id: Ied94691f2b6b17f3c94a7e42bcb9965ee72c956e


Trivial merge