1650
It's official: Smartphones will need to have replaceable batteries by 2027
(www.androidauthority.com)
This is a most excellent place for technology news and articles.
You're correct, though the Galaxy S5 is a bad example. Tthe device looked and felt like a Fischer Price toy. It had flaps everywhere, was annoying to use, and even had a billion software notifications to keep reminding you to monitor and close said flaps. Nowadays we can certainly do better.