[dali_1.9.18] Merge branch 'devel/master' 55/237255/1
authorGyörgy Straub <g.straub@partner.samsung.com>
Fri, 26 Jun 2020 08:10:33 +0000 (09:10 +0100)
committerGyörgy Straub <g.straub@partner.samsung.com>
Fri, 26 Jun 2020 08:10:33 +0000 (09:10 +0100)
Change-Id: I495aa18443837b0461727fc35677697af97e209a


Trivial merge