[dali_2.0.40] Merge branch 'devel/master' 50/262850/1
authorDavid Steele <david.steele@samsung.com>
Fri, 20 Aug 2021 11:19:20 +0000 (12:19 +0100)
committerDavid Steele <david.steele@samsung.com>
Fri, 20 Aug 2021 11:19:20 +0000 (12:19 +0100)
Change-Id: I3cf7336a08e87d4723a22ef4a6acf356658f3d82


Trivial merge