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


Trivial merge