Merge "Filter out detached views from touch" into pi-dev
am: 01487d9734

Change-Id: I207b4c86705c7ea2dd0c746f9dd83e084064ec80