[dali_1.9.15] Merge branch 'devel/master' 48/235548/1
authorAnton Obzhirov <a.obzhirov@samsung.com>
Fri, 5 Jun 2020 10:21:38 +0000 (11:21 +0100)
committerAnton Obzhirov <a.obzhirov@samsung.com>
Fri, 5 Jun 2020 10:21:38 +0000 (11:21 +0100)
Change-Id: Ibcd29760952cac759988168e94675b49e2ffcaa7


Trivial merge