Fix: Reliability and robustness improvements on Android.