Merge "Lower touch slop in ViewConfiguration." into ics-mr1