Fix modal backdrop overlaying the modal's scrollbar

Fixes #14916.
Fixes #15008.

/cc @cvrebert 
Same issue here +1