[dali_1.0.31] Merge branch 'tizen'