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


Trivial merge