am 52da9fa7: (-s ours) am c4ce0da2: DO NOT MERGE - Delay starting scale gesture events until a touch slop threshold

* commit '52da9fa7b53690c073b15d849d0d9befe47314f7':
  DO NOT MERGE - Delay starting scale gesture events until a touch slop threshold