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


Trivial merge