Merge "Fix crash during TextView.onCreateContextMenu" into oc-dev