Merge branch 'tizen' into tizen_4.0