[dali_2.0.9] Merge branch 'devel/master' 05/251605/1
authoradam.b <adam.b@samsung.com>
Fri, 15 Jan 2021 11:17:09 +0000 (11:17 +0000)
committeradam.b <adam.b@samsung.com>
Fri, 15 Jan 2021 11:17:09 +0000 (11:17 +0000)
Change-Id: I6346333df14762bd6b26b6aa750e25cbc79cc55b


Trivial merge