Merge branch 'tizen' into tizen_5.5