[dali_1.0.2] Merge branch 'tizen'