Merge "People: Action bar tab refactoring"