am aff90790: am 4280891d: Merge "The bigger touch slop still has a problem"

* commit 'aff90790dff94eb9a4bed541eff4f106623afd09':
  The bigger touch slop still has a problem