Merge branch 'tizen' into tizen_7.0