Merge "Fix the sort order of the input methods & subtypes in the settings." into honeycomb-mr1