Merge "Fix virtual touchpad re-attachment."