[dali_1.9.21] Merge branch 'devel/master' 18/238818/1
authoradam.b <adam.b@samsung.com>
Fri, 17 Jul 2020 12:12:48 +0000 (13:12 +0100)
committeradam.b <adam.b@samsung.com>
Fri, 17 Jul 2020 12:12:48 +0000 (13:12 +0100)
Change-Id: I4c36c9cfae6e4ee06af3d261c646ce947d0596c7


Trivial merge