[dali_1.9.13] Merge branch 'devel/master' 88/234188/1
authoradam.b <adam.b@samsung.com>
Fri, 22 May 2020 09:55:04 +0000 (10:55 +0100)
committeradam.b <adam.b@samsung.com>
Fri, 22 May 2020 09:55:04 +0000 (10:55 +0100)
Change-Id: Ie268d6e8db873edd06bbfed5c86561a07ec1fc2e


Trivial merge