Is Settings - Battery - Battery saver and performance - Performance profile set to Efficiency already?