Merge branch 'tizen_4.0' into tizen_5.0