Merge "Fix 29094: Some XML file types open multiple editors"