Merge remote-tracking branch 'origin/patch'

Conflicts:
	Ghidra/Features/Base/src/main/java/ghidra/app/merge/datatypes/DataTypeMergeManager.java

Author: ghidra1

Ghidra/Features/Base/src/main/java/ghidra/app/merge/datatypes/DataTypeMergeManager.java

@@ -162,8 +162,7 @@ private boolean launchBitFieldEditor(int modelColumn, int editingRow) {
 
 				BitFieldEditorDialog dlg = new BitFieldEditorDialog(model.viewComposite,
 					provider.dtmService, editingRow, ordinal -> {
-						model.fireTableDataChanged();
-						model.compositeInfoChanged();
+						model.notifyCompositeChanged();
 					});
 				Component c = provider.getComponent();
 				Window w = SwingUtilities.windowForComponent(c);