[dali_1.4.39] Merge branch 'devel/master' 93/214893/1
authoradam.b <adam.b@samsung.com>
Fri, 27 Sep 2019 09:16:55 +0000 (10:16 +0100)
committeradam.b <adam.b@samsung.com>
Fri, 27 Sep 2019 09:16:55 +0000 (10:16 +0100)
Change-Id: Id8932bc211348513f9033267033e06e2e2aff6ad


Trivial merge