am 4826c3ff: Merge "Fix language switch key behavior (DO NOT MERGE)" into jb-mr1.1-dev

* commit '4826c3ff7ec8640d2a982e9362577b2900614080':
  Fix language switch key behavior (DO NOT MERGE)