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


Trivial merge