Includes_WidgetLayout.xml merge fix