Merge branch 'tizen_6.5' into tizen