Merge pull request #7521 from JosJuice/android-rotate-savestate Android: Don't create a savestate when rotating