am 9371747e: 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 '9371747e752236727be58149a8d04248860c134f':
  Fix an inconsistent state with IMMS and Settings when the hard keyboard is connected