[dali_1.9.5] Merge branch 'devel/master' 77/229077/1
authoradam.b <adam.b@samsung.com>
Fri, 27 Mar 2020 13:29:53 +0000 (13:29 +0000)
committeradam.b <adam.b@samsung.com>
Fri, 27 Mar 2020 13:29:53 +0000 (13:29 +0000)
Change-Id: I75797d7687e357e31811a849f773211916cdd990


Trivial merge