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


Trivial merge