Don't forget Sony. They are pretty reliable about updating their Z-series.

Full disclosure: have a Z3, mostly for this and because it was waterproof. The screen is now partially detached in the top after less than one year of use which annoys me but I hope to get it resolved under warranty.