am 2656abe0: Merge "Fix an inconsistent state with IMMS and Settings when the...
am 2656abe0: Merge "Fix an inconsistent state with IMMS and Settings when the hard keyboard is connected" into jb-mr1.1-dev
* commit '2656abe0':
Fix an inconsistent state with IMMS and Settings when the hard keyboard is connected