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


Trivial merge