Merge "Extract JoystickInputMapperTest to its own file" into main