Does the s6 have better battery than the s5? I'm about to get an upgrade opportunity, and I'll only trade in my s5 if the battery will improve. The s6 doesn't look like anything special otherwise.