Merge "Update shortcut IME when asked. And match the language of subtype by "startWith" not "equals"." into honeycomb