am 2ff43774: (-s ours) Reconcile with jb-mr0-release - do not merge

* commit '2ff437745ec1e3463d4e7b831bf2b173aa38dad4':
  DO NOT MERGE - Make WebView track focal points more accurately
  DO NOT MERGE - Delay starting scale gesture events until a touch slop threshold