As batteries keep catching fire, U.S. safety agency prepares for change