Merge pull request #9717 from JosJuice/android-issettingsaveable Fix Android controller mappings accidentally being in IsSettingSaveable
