[dali_1.4.48] Merge branch 'devel/master' 06/219006/1
authoradam.b <adam.b@samsung.com>
Fri, 29 Nov 2019 12:18:10 +0000 (12:18 +0000)
committeradam.b <adam.b@samsung.com>
Fri, 29 Nov 2019 12:18:10 +0000 (12:18 +0000)
Change-Id: I18d3a0e15f593c596a197aaf28bb0e1e1b4bd040


Trivial merge