Backport PR #12142 on branch v3.0.x (Unbreak formlayout for image edits.)#12143

tacaswell merged 1 commit intomatplotlib:v3.0.xmatplotlib/matplotlib:v3.0.xfrom

meeseeksmachine:auto-backport-of-pr-12142-on-v3.0.xmeeseeksmachine/matplotlib:auto-backport-of-pr-12142-on-v3.0.xCopy head branch name to clipboard