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