Merge "Fixes for touchpad capture"