[dali_1.0.25] Merge branch 'tizen'

No match.