[dali_2.0.6] Merge branch 'devel/master' 58/250058/1
authoradam.b <adam.b@samsung.com>
Fri, 18 Dec 2020 11:09:39 +0000 (11:09 +0000)
committeradam.b <adam.b@samsung.com>
Fri, 18 Dec 2020 11:09:39 +0000 (11:09 +0000)
Change-Id: Icd7c8ef4fb23face3c9bbdf118a03621ed93cc8f


Trivial merge