[dali_1.9.35] Merge branch 'devel/master' 12/246112/1
authoradam.b <adam.b@samsung.com>
Fri, 23 Oct 2020 10:46:15 +0000 (11:46 +0100)
committeradam.b <adam.b@samsung.com>
Fri, 23 Oct 2020 10:46:15 +0000 (11:46 +0100)
Change-Id: Ida2905d9e801e53e366e932d230295cb00312ff9


Trivial merge