[dali_2.0.9] Merge branch 'devel/master' 06/251606/1
authoradam.b <adam.b@samsung.com>
Fri, 15 Jan 2021 11:17:21 +0000 (11:17 +0000)
committeradam.b <adam.b@samsung.com>
Fri, 15 Jan 2021 11:17:21 +0000 (11:17 +0000)
Change-Id: If6ae1cc6c95263c742cd45326acf416c11a0da13


Trivial merge