Issue #3033279 by lauriii, mandclu, Eli-T: Move markup from template_preprocess_image_widget to a template