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

* commit 'e49611452823d74b0657aed1cee8a4863f95ad8d':
  Treat additional inputmethod subtypes per user