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

* commit '2656abe09895088eca25caafc3e92869217d1447':
  Fix an inconsistent state with IMMS and Settings when the hard keyboard is connected