Cherry pick virtual joystick fix from Stable