* Fix calls on Android 15
* Fix rare crash / regression introduced with 2.17.0