[dali_1.9.14] Merge branch 'devel/master' 94/234894/1
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 29 May 2020 11:18:11 +0000 (12:18 +0100)
committerAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 29 May 2020 11:18:11 +0000 (12:18 +0100)
Change-Id: I6de664b52f48c857bd35d13421db5e0f664b36da


Trivial merge