Merge "Fix NPE in ExternalRawContactEditorView"