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


Trivial merge