Merge "Fixes for touchpad capture" am: c5ea003bbb
am: 6f72ed8b27

Change-Id: I07e2ce2f93a8ed920879759873af4f0f40191b87