Merge "Miscellaneous contact-detail fixes."