am 7b4f60de: Merge "Special case game controller fallback keys for Japan" into klp-dev

* commit '7b4f60deb2819496733c0c85c57c6236900fe0c2':
  Special case game controller fallback keys for Japan