Merge "Fix ContactEditorActivity aliases" into oc-dev