fix cherry-pick
Enable wireless Xbox 360 controller support