Merge "Fix PhysicalKeyboardSettings by merging it into InputMethodConfig." into honeycomb