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


Trivial merge