We are at least five years away from battery tech that can step into a Lion's shoes. While we are trained and equipped to prevent such fires from spreading in the passenger cabin, the smoke can be problematic, if the fire is not quenched quickly. The real threat to safety is batteries carried down below (and of course, the freight boys that haul them regularly).
The ICAO has moved to ban bulk shipments in the belly of passenger aircraft two years ago, but while the Obama administration wanted immediate action from Congress to join the global community on this, Trump rescinded the move, put it on executive hold, allowing US aircraft carriage of these batteries in commercial bulk shipments on passenger aircraft.
A curious move considering Trump's own twittered thoughts on Lion batteries back in 2014:
"Lithium ion batteries should not be allowed to be used in aircraft. I won't fly on the Boeing 787 Dreamliner. It uses those batteries" 19 Mar 2014.