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

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