[dali_1.0.42] Merge branch 'tizen'

No match.