[dali_1.9.16] Merge branch 'devel/master' 62/236062/1
authorCheng-Shiun Tsai <cheng.tsai@samsung.com>
Fri, 12 Jun 2020 09:07:55 +0000 (10:07 +0100)
committerCheng-Shiun Tsai <cheng.tsai@samsung.com>
Fri, 12 Jun 2020 09:07:55 +0000 (10:07 +0100)
Change-Id: Id4535a14f87ee7277b0767658e566c653b4d3bad


Trivial merge