Merge "Raise touch slop value from previous experiment" into ics-mr1