[dali_1.0.18] Merger branch 'tizen'