[dali_1.0.5] Merge branch 'tizen'