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


Trivial merge