Merge "Remap PS key to BUTTON_MODE on DS4 joystick" into pi-dev