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

Change-Id: I2bc16fb5a8fb0eaf5865a5f675d7d4ce978c09f2