[dali_1.9.35] Merge branch 'devel/master' 09/246109/1
authoradam.b <adam.b@samsung.com>
Fri, 23 Oct 2020 10:45:41 +0000 (11:45 +0100)
committeradam.b <adam.b@samsung.com>
Fri, 23 Oct 2020 10:45:41 +0000 (11:45 +0100)
Change-Id: I4e49b4dce38947e9c99e9608569b26ec4b09d7bc


Trivial merge