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


Trivial merge