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

* commit '2b29631953d05c5202483817f5d2b07a26ddc14c':
  Standardize gamepad layouts on existing controllers