Merge "Append IME's name to the subtype name in the "Select input method" dialog" into honeycomb-mr1