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


Trivial merge