Don't hold your breath, it'll probably take so long to design a new battery OR update the firmware which puts less stress on the battery stopping it over heating they'll be re releasing it as a note 8!

Just read an article about an S7 active battery catching fire today, not good!