
Restore the changes introduced in #17075, which wre accidentally overwritten while rebasing #17155. Also, simplify the topbar positioning rules.
Restore the changes introduced in #17075, which wre accidentally overwritten while rebasing #17155. Also, simplify the topbar positioning rules.