[dali_2.0.31] Merge branch 'devel/master' 03/260103/1
authorDavid Steele <david.steele@samsung.com>
Fri, 18 Jun 2021 10:38:45 +0000 (11:38 +0100)
committerDavid Steele <david.steele@samsung.com>
Fri, 18 Jun 2021 10:38:45 +0000 (11:38 +0100)
Change-Id: Ia3171b4588515b9c2029832d566d6971043ed48e


Trivial merge