Merge branch 'Issue-2393099' into 7.x-1.x
Issue #2393475 by eshta: Fix message box z-index to place beneath unibar.
Merge branch 'Issue-2393475' into RC