I got the S2 a few days ago, and it's running 2.3.6
I've factory reset the phone once because battery drain was just enormous.
Here are a few screenshots. - this is after changing wifi settings to "when screen turns off". This is also after "calibrating the battery" as many people suggested, but...