Merge "[DO NOT MERGE] Clean up PeopleActivity in i-dev" into ub-contactsdialer-i-dev