Merge pull request #4494 from kumpera/important-android-fixes