Merge "Input settings: Associate keyboard layouts with device/IME subtype."