Merge "Fix auto-complete for content-editable fields."