If you swipe down on the Control Panel side of your display, you’ll see a pencil icon. Once in that menu, you’ll see Panel settings in the top left, where you can combine notifications and quick settings again. If you really need extra quick toggles displayed at once, perhaps it's worth leaving the One UI 7 change as-is, but I like reverting.

Samsung is emailing customers the code “S25APP” which knocks 5% off the total price of the device when it is bought in the Samsung Shopping app. This appears to be a rebrand of the long-standing “APP5” discount issued to first-time buyers.