Merge "Fix default behavior for gamepad buttons"