Merge "Show implicitly enabled subtypes in the input method selection dialog" into honeycomb