Fixed modal_window z-index for issue #21003
Merge branch 'master' into development