Yup. Removable batteries are more rare in flagships than headphone jacks. Currently rocking a Zenfone 6, my next one will be an Xperia - as long as they don’t mess it up by removing one of the critical features. (I’m still salty about the removal of the notification led.)