Merge "Contact editor fixes"