[dali_1.0.4] Merge branch 'tizen'

No match.