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


Trivial merge