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


Trivial merge