Fix modal backdrop overlaying the modal's scrollbar

Fixes #14916.
Fixes #15008.

/cc @cvrebert 
Ah, yes, I realized that at some point to when I started working on #14933.