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

Change-Id: I6446b5b6cfb119c8af22b3d2c6139acd8fbc2d56