Merge "Implement preferred phone account columns"