Fix 9.2 conflicts for "Replaced duplicate z-index with index of 400"

• Encountered conflicts while picking !11547 (merged) onto 9-2-stable
• Please fix the conflicts and merge this into 9-2-stable

mentioned in merge request !11547 (merged)

/cc @selfup

added 1 commit

• 2f4cdca6 - Resolve header.scss conflicts

Compare with previous version

approved this merge request

mentioned in commit b9934e70

merged