Pretty much.

The market for upgrades in every product area is limited to enthusiasts and business. It's just not worth doing, honestly, unless the device is hideously expensive and the market is fast-moving but inconsistent like PCs in the 1980s and 1990s. Otherwise either upgrades don't give enough value to be worth buying an upgrade or you basically need to upgrade everything anyway.

Battery life is a solved issue with a lot of things, now, though. Because phones and laptops aren't increasing in capability as fast, manufacturers have started to offer free or nominal cost replacement services for those components.