Removed trailing whitespace
Synced xpad_device.cpp with stable branch