Merge pull request #11393 from JosJuice/android-move-fps Android: Move FPS-related settings to a submenu