Merge pull request #12375 from JosJuice/android-gate-size-crash Android: Fix crash when trying to edit gate size setting