Merge "PeopleActivity: Remove context menu code"