Merge pull request #10463 from JosJuice/android-remove-legacyintsetting Android: Get rid of LegacyIntSetting
