[dali_1.9.36] Merge branch 'devel/master' 36/246536/1
authorDavid Steele <david.steele@samsung.com>
Fri, 30 Oct 2020 14:34:16 +0000 (14:34 +0000)
committerDavid Steele <david.steele@samsung.com>
Fri, 30 Oct 2020 14:34:16 +0000 (14:34 +0000)
Change-Id: I6e6c163ce501214fcfc44d62731b3121d3c1fbaf


Trivial merge