Created attachment 15928 [details] Patch Applies cleanly back to 4.9
Reassigning to Karolin for inclusion in 4.11 and 4.12.
Pushed to autobuild-v4-{12,11}-test.
(In reply to Karolin Seeger from comment #3) Pushed to both branches. Closing out bug report. Thanks!