Sadly, I suspect that if/when they lose an aircraft due to a battery fire in the hold, the loss will be blamed on something else.
If the lithium ion batteries continue to be the "go to" power source for most things electronic and they do not find a way to make them less fire prone, I can envision an eventual future where the batteries will come in several generic sizes/types (such as regular batteries come in AA, AAA, C, D, etc). You will purchase your device with a battery, then before getting on a plane, you will turn that battery in. While on the aircraft, you'll be able to operate your device "plugged in" to onboard power. Once you land, you'' go to a kiosk where you can rent a pre-charged battery to use while at your destination. On the return trip, you simply turn that battery back in, and get a replacement when you get home. It would be similar to the way (at least here in the US) you bring in your empty barb-b-que propane tank and swap it for a full one.