[dali_2.0.22] Merge branch 'devel/master' 29/257029/1
authorDavid Steele <david.steele@samsung.com>
Fri, 16 Apr 2021 13:03:25 +0000 (14:03 +0100)
committerDavid Steele <david.steele@samsung.com>
Fri, 16 Apr 2021 13:03:25 +0000 (14:03 +0100)
Change-Id: Iee556eedfc5037723ae9317615ce522232025d3d


Trivial merge