Android crash fix on new devices
Merge pull request #6097 from newnon/android_crash_fix

Android crash fix on new devices