Merge pull request #121058 from syntaxerror247/fix-android-editor-crash