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


Trivial merge