Merge "Filter out detached views from touch" into pi-dev