Fix 9.2 conflicts for "prevent dropdowns from being cut-off by scrollable tab container"

• Encountered conflicts while picking !11399 (merged) onto 9-2-stable
• Please fix conflicts here and merge directly into 9-2-stable

mentioned in merge request !11399 (merged)

added 1 commit

• 08941e47 - Fix conflicts

Compare with previous version

@timothyandrew fixed!

cc @psimyn

/cc @selfup

@timothyandrew should this be merged after it passes?

approved this merge request

Nevermind, I should've read the MR description 😄

added 11 commits

• 08941e47...8cba1f51 - 9 commits from branch 9-2-stable
• 229b1e2e - Merge branch '32326-scrollable-tabs-overflow' into 'master'
• 5eabd01c - Fix conflicts

Compare with previous version

added 1 commit

• 57e4f68f - Fix conflicts

Compare with previous version

approved this merge request

enabled an automatic merge when the pipeline for 57e4f68f succeeds

mentioned in commit 8e225051

merged

Merged into 9-2-stable, will be in 9-2 RC6