am 53b6d510: am 2b296319: Merge "Standardize gamepad layouts on existing controllers" into jb-mr2-dev

* commit '53b6d5106dc65a12f24aa5f90dc87dd5a749d54c':
  Standardize gamepad layouts on existing controllers