[dali_2.0.15] Merge branch 'devel/master' 37/254337/1
authorDavid Steele <david.steele@samsung.com>
Fri, 26 Feb 2021 12:44:08 +0000 (12:44 +0000)
committerDavid Steele <david.steele@samsung.com>
Fri, 26 Feb 2021 12:44:08 +0000 (12:44 +0000)
Change-Id: Id1713b4d4d1033f6d3d378bf98baac6c0fcebf67


Trivial merge