[dali_1.9.13] Merge branch 'devel/master' 87/234187/1
authoradam.b <adam.b@samsung.com>
Fri, 22 May 2020 09:54:49 +0000 (10:54 +0100)
committeradam.b <adam.b@samsung.com>
Fri, 22 May 2020 09:54:49 +0000 (10:54 +0100)
Change-Id: Ib3a3d1dac271481372ac7380b2787a816ff32af1


Trivial merge