Merge pull request #9266 from JosJuice/android-startup-illegalstate Android: Fix IllegalStateException on startup
