Bug 831217 Align Contact Settings with latest UX Specifications