Conflict resolution buttons clipped

Environment

• Git Extensions 33.33.33
• Build ba502bcb209b1d944d592835b2c0ee1eedd7750b

This is a combination of https://github.com/gerhardol/gitextensions/tree/feature/net9-theming and https://github.com/mstv/gitextensions/tree/feature/filestatuslist_toolbar branches:

Issue description

Steps to reproduce

Create a conflict and let it surface the controls in the main form.

Did this work in previous version of GitExtensions?

Yes. The regression is due to new geometry requirements in Windows Forms dark theme.

Diagnostics

No response