[dali_1.9.15] Merge branch 'devel/master' 52/235552/1
authorAnton Obzhirov <a.obzhirov@samsung.com>
Fri, 5 Jun 2020 10:22:18 +0000 (11:22 +0100)
committerAnton Obzhirov <a.obzhirov@samsung.com>
Fri, 5 Jun 2020 10:22:18 +0000 (11:22 +0100)
Change-Id: Idf1b239be2ab6cf54b55f9a245793535d2a5bfd1


Trivial merge