Merge "Treat additional inputmethod subtypes per user" into jb-mr1-dev