Merge remote-tracking branch 'origin/API4' into tizen_4.0