Merge "Change ClipData.addItem signature" into oc-dev