am 5327322a: Merge "Revert "Fix a bug where disabled auxilialy IME is unexpectedly re-enabled"" into jb-mr1.1-dev

* commit '5327322ab94711a654d41a5b53be3bf6a3a28a39':
  Revert "Fix a bug where disabled auxilialy IME is unexpectedly re-enabled"