- Handle subtypes correctly in InputMethodPicker Change-Id: I0ff9baec46724ca9dee2a7943fee69d4b204589e