[dali_2.0.5] Merge branch 'devel/master' 50/249450/1
authorDavid Steele <david.steele@samsung.com>
Fri, 11 Dec 2020 12:11:35 +0000 (12:11 +0000)
committerDavid Steele <david.steele@samsung.com>
Fri, 11 Dec 2020 12:11:35 +0000 (12:11 +0000)
Change-Id: I72aa493fb23382a0224b351c9a6fe6e30d649fec


Trivial merge