Merge "Remove externaledit/externaldiff preference"