Merge pull request #4219 from SeannyM/android-state Android: fix save and load state menus on non-TV devices
