am 002a502c: Merge "Update keyboard settings wording" into jb-mr1-dev

* commit '002a502c845dfc085dc4c70384c8e0ea90a15f79':
  Update keyboard settings wording