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
Do not update/delete: Banner broadcast message test data
Do not update/delete: Notification broadcast message test data
9-2-stable
9-2-stable