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


Trivial merge