Merge "Fix overdraw in PeopleActivity"