[dali_1.9.36] Merge branch 'devel/master' 35/246535/1
authorDavid Steele <david.steele@samsung.com>
Fri, 30 Oct 2020 14:34:02 +0000 (14:34 +0000)
committerDavid Steele <david.steele@samsung.com>
Fri, 30 Oct 2020 14:34:02 +0000 (14:34 +0000)
Change-Id: I94b253ae5068938bbdf079d35610fd247deaf089


Trivial merge