[dali_1.9.7] Merge branch 'devel/master' 76/230376/1
authorAnton Obzhirov <a.obzhirov@samsung.com>
Thu, 9 Apr 2020 14:49:28 +0000 (15:49 +0100)
committerAnton Obzhirov <a.obzhirov@samsung.com>
Thu, 9 Apr 2020 14:49:28 +0000 (15:49 +0100)
Change-Id: I8ad39713d6812f9236a78afd587f22247c0c375c


Trivial merge