[dali_2.0.22] Merge branch 'devel/master' 30/257030/1
authorDavid Steele <david.steele@samsung.com>
Fri, 16 Apr 2021 13:03:30 +0000 (14:03 +0100)
committerDavid Steele <david.steele@samsung.com>
Fri, 16 Apr 2021 13:03:30 +0000 (14:03 +0100)
Change-Id: Idd791ecad21d8964c3ccf4746a730284259d9213


Trivial merge