Merge "Fix LayoutEditorMatchingStrategy to handle non-layout files"