Merge "Fix Autofill profile editor UI."