Merge "Keeping the custom widget placeholder even when the plugin is not corrected" into main