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


Trivial merge