Allow city field to use another input method
Merge pull request #5092 from wicaksono/master

Allow city field to use another input method
merged and updated checkout with #5092