Merge "Remap PS key to BUTTON_MODE on DS4 joystick" into pi-dev am: 796fa51c8a
am: dbca93d55a

Change-Id: Ib04a7f55a2f994a389276f8c3f6f32c20710312a