[dali_1.0.21] Merge branch 'tizen'

No match.