[dali_1.3.18] Merge branch 'devel/master'
[dali_1.3.18] Merge branch 'devel/master'

Change-Id: Ie62283f835057cf37987c1cdcbd6873c109cf88d

dalihub/dali-demo,dalihub/dali-demo,dalihub/dali-demo,dalihub/dali-demo