custom_1137_WidgetLayoutDialog.xml merge fix