am d839242c: am bfcd2b3f: Merge "Change to "Show language switch key" option" into jb-mr1-dev

* commit 'd839242c95b6f251a005c07bdc179c6647906e9a':
  Change to "Show language switch key" option