Made adjustments for Android 16.
