Merge "Unhide more ContactsContracts fields"