am 732e589c: am 6e8c1495: Merge "Re-read shortcut labels if the language has changed"

* commit '732e589c1040cb29deac499ae155bbb7c7358def':
  Re-read shortcut labels if the language has changed