Merge pull request #8452 from JosJuice/android-emulationactivity-rotation-crash Android: Replace emulation rotation crash workaround with proper fix
