am 94567d8b: am caf15c3c: Merge "Fix a bug that would persist caps lock state" into jb-mr1-dev

* commit '94567d8bea35555b5708e517c857dfe7c3d0eff8':
  Fix a bug that would persist caps lock state