am 9f207a85: (-s ours) am aff90790: am 4280891d: Merge "The bigger touch slop still has a problem"

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