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


Trivial merge