2 Commits (fixes/android-render-issue)