Settings > Battery and click on Battery Protection it'll give you new options to protect your battery.
With Battery drainage, I found the first day or two my battery depleted quickly but I don't have any issues. I suspect, it may be that with new features the phone needs to optimise itself again?
I would also recommend doing a clear cache partition by turning off phone, connect to PC/Laptop and press and hold power button and volume up button until you see Samsung logo. When in recovery mode, highlight option (using volume down) for clear cache partition and press power button to confirm.