[dali_1.0.40] Merge branch 'tizen'