Merge pull request #3493 from sigmabeta/android-tv-screenshot-bugfix [Android] Minor refactor + bugfix
