Merge "Fix NPE in PeopleActivity with returning a null intent from editor" into ics-mr1