[dali_2.1.21] Merge branch 'devel/master' 18/274718/1
authorDavid Steele <david.steele@samsung.com>
Fri, 6 May 2022 11:37:42 +0000 (12:37 +0100)
committerDavid Steele <david.steele@samsung.com>
Fri, 6 May 2022 11:37:42 +0000 (12:37 +0100)
Change-Id: I53ac5cced2cc0b247afc3c2404aca7ad8fc09664


Trivial merge