Merge "Standardize gamepad layouts on existing controllers" into jb-mr2-dev