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

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